Adhere to new class commons specs.