Added names and validation