Luis: now maps works with id