So should we change the Class param too for consistency?