Changed the core extensions to be helper functions.