Basic maps framework
Merge fix