WIP: added onMap and active attributes. Working on update method