Adding Form functionality