Fixed cargo and arquillian setup