Decided these modules should be classes for new APIs