Update: Implementing maps features