Implemented necessary changes to remove implementation from handler.