Added TP entities classes