Resolving import issues