Switch sortable model
Update to latest build changes