internal refacto no API change
fix dependencies