Moved Di definitions to new class based format

make it 5.3 compatible array . As di is 5.3 compatible.