Changes on model, parser and presentation layer