Removed some units, replaced spacefed-auth by spacefed with new sub-elements. Made some fields optional.