Added more fields in modal