Added productions for scalar & list constants