Added required fields and error / success reporting