Simplified Mapper interface, added geo classes
Simplified Mapper interface, added geo classes