Change listing forms and model to include all fields