Small updates; added a decorator.