Model working again with refactored AS