Enabled more validation methods