:smoking: more maps functionality