Reflect new Forms API