Updated hunt wrapper and added user wrapper