Update model, parser and validation of local do