expanded maps functionality