Added class and namespace.