Made resolve structure exported outside the package