Added multiple map methods and improved query