Separating Map Options out