Wrapped to namespace and code corrections.