Added format conversion support