Added initial custom formatting support