Refactored compute engine to run with both clients