Migrate away from @ConstructorProperties