Added some utility and management classes.