#48 add validation and field