Add support for nested embedded tuples
Split mapper definition dsl specs
Add support for nested grouping