Fixed dependency issue for jenkins and allowed for more flexibility in the future