Revision need to entityproto
Need entity class and member functions completed