Several utility functions were added