Adding and removing properties and scenarios to associate them with groups for #328