Improvements to validation and individual statement.