Switch from dependencies to explicit imports