removed old code
added entityname class method