not sure if the new 'location' of the imports is better (```Set```) is still missing on the class