Updated map to current design