enhanced abstract model
fixes
Merge branch 'master' of https://github.com/skar-zf2/SzfBase