#11 Added validation of fields