Added ObjectBase, Client entities