Finish Conversion to CompManager