API changes, fixes for new class implementation