Fixing Namespace, extending examples