Improved property factory basement
Removed extra flag (BC break) and done some small tweaks
Merge branch 'annotationsParser' into develop