Added simple form and updated forms