Added standard responses, fixed validation