Made some changes to forms and datasource interface