Made maps public as this is going to be part of common module