Bringing auxiliary classes up to speed