An Extended Theory of Rational Addiction