Make Economics comprehensive