Improved map form