Better handling of relative imports