Added response status, removed TODO