Removed namespace feature for now