Added Entity stuff