Supplemented missing internal utility functions