Added the formfields functionality