Feature/default week namespaced