Add some new helper functions