Handle deps better so we don't get them everytime