Fixed some paths to satisfy CQRS