Added support for builtin maps and layers
Merged all models to have one ancestor, and added support for builtin maps