Extra utility functions missing from last commit