Updated resolve to be exposed but _ prefix