reducing the namespace and adding options