data model + parser methods modifications