Added definitinos for "class" and "namespace"