Reduce dependencies on core libraries