added types and other goodies