Added code to factory/handler to handle responses. Changed some names.