Small changes on ComputationUnit