Updated Controllers for more AJAX support