Made changes to optimize map layer