Added extra utility functions