Helpers to help clean up scenarios around API