Added regex and more namespacing