Refactoring access to model and making access do DAO synchronous.
Merge remote-tracking branch 'origin/master'