Extract trait refactor is removing import for class used in Annotations

User picture
User picture
User picture
User picture
User picture
User picture
User picture
User picture
User picture
User picture
User picture
User picture