Updated map system logic