Decouple types/imports