Update to support FormBundle