removed mappings module
added XY support