Updated model use namespacing