[Users]: Improved maps