Made changes to parser in order to account for constants.