Update to make map optional and stop event prop.