Started to replace some utility functions.