add fields and modified validation