Final iteration 2 backend changes

Final iteration 2 backend changes