Update access module with new model
Update modules and tests with new model
Merge branch 'update-model'