Updated decorators.
Auxiliary files added.