Added constants and instance expressions