Working on fixing namespace