Refactor Definition invoke