Move decorator into a module