Moved configuration to parent model and added measurement selection options