Loosened dependencies on base