More work on the AJAX Handlers