Added CLI format checking