Added more Entity model changes

And lots of client side script changes