More improvements in Entity System added stability and optimizations