List and Map with functional approach
AOP uses new collections on some places
Merge branch 'collections' into dev