Long TypeProperty and GeneratedId
Packaging refactoring