Switch to using Roar::Decorators