Utility functions and classes added.