Modified contact form handling to entity based + persistance in db