Added new domain and type objects, base-line versions