Added additional helper functions