[I] improve the parser, and prepare the job for the futur command