Updated entity classes
Merged with Michel van Os's commit
Merged with Michel van Os 2