Updated with new namespace and schema location