Refactored decorators - I don't think this breaks anything