Change nesting structure, add validation error messages.