Separate v2 resource definition. bugid:111942