Changes in many types and classes reflecting new spec-file. Temporary
commit. Compilation is broken now.