- updated a bit Parsing Interface