Reduced dependency on core