Redesign to more automatic bounded context