Moving instruction helpers into package