Removed hacky private namespace stuff