Added maps functionality from external branch