Refactor the narrator proxy class