Better helper, including spec