Add bean support
work on property manager
Merge remote-tracking branch 'origin/master'