Removed direct dependency on CLManager