Fixed some generics issues with maps
Finally got working Collection and Map support, so I can now actually do domain modelling.
Added basic support for implementation in the traits/beans