Changes 4/1/2013 - added types