Fixed command build and routing