Moving Map type into internal module namespace
Ensuring the internal Map type can be serialised to a Query
Removing qualified Map imports