Updated to native format size and number functions.