Refactor CallerTrait a bit