Changes to handle set loading in deployment comp