Added format check