Added parsing of model definition lines with overrides