Updated some config and routing