Added comp default vals