Use contain to fix dependency problems