Worked on the hibernate/hibernate-orm repository to address a critical issue in metamodel generation, specifically ensuring that SingularAttribute collections preserve the correct generic type. Applied expertise in Java, Hibernate, and JPA to update the metamodel-generator tooling, resolving a bug that previously led to raw type generation for generic collection fields. The solution involved modifying annotation processing logic and handling merge conflicts in MetaAttributeGenerationVisitor, followed by targeted regression testing to validate the fix. This work improved the accuracy of generated metamodels, reduced runtime type errors for applications using generic collections, and enhanced the reliability of development tooling for Hibernate users.