Updating models. Fixing namespace issues