Add additional format.c functionality