Added store measurement functionality with entity type pop-up