Updated map flow
Added support for opacity