Add Attachment:DRY-143: Method invocation: unchecked conversion required -> erase return type