Implement more invoke op handler
Merge refactor package into main package