Added initial expression and constant parsing, as well as a number of model elements