added client model and updated form with select options