Initial updates to support SimpleForm integration