Updated schema namespaces, fixed imports