Convert to CompManager Instead