Improving Entity for LUA prep