added Entity and Util