Updated config to remove dep cycle