Path and imports update