Add helpers to dry up some functions