Simplified Mapper interface, added geo classes