Changed from enum to Namespace