Added conditions to default map