Moved around decorator methods.