Fixed content path issues & updated secondary namespaces