Be more flexible in the cabalfiles that we handle