Improved entity system a bit