Rewritten declarations.di