Add Missing code about new farm enabled feature