Added entity classes for TTT
merge stuff