Moved Di definitions to new class based format