Added more overlays objects. Refactored names in the model.