typed map methods added to query
query refactored as a trait for future extensions
beautify
transformer added to typed map methods