updated based on core library changes