Fix for access-list model changes