HR-226 - Add misc helpers