Removed DiExtra dependency