Adding format check