Modified the entity system a little bit