add real formats support - small clean