Added complexity in map