Added some map code, update entity, and changed dateformat