Fixing issues after di implementation