added entity objects for measurements and switches
refined the interfaces with the entity objects