Use new selectors for form