fix wrong implementations
Merge branch 'fix-ModelFacade' into DataAccessEntity