Modified db model and worked on forms