Changed some property types