Switched to a proper entity system