Implemented adding fields and conditions