updates to model to use new activeQuery
Merge branch 'dev' into base-build
added update to abstract driver interface
Merge branch 'dev' into base-build