Add format.c additional functions