Entity partially reinstated; 0.0.2