Changed StdEntity to AbstractEntity