Updated entities classes