Add structure for Parser and CLI