Add some new helpers