Removed Dibi dependency