Added report models and cleaned up contract model