made two types of entities simpler