Added auto find of form component