Added modified economics classes