Fix class decorators

Replace class decorators with a more verbose declaration of the mapping.