Added fixes to mass assignment