Feature/week namespace