New helper functions