Fixed registration to work with new class implementations