Added more format codes