Several enhancements to add flexibility in formatting