Add keep files
Make depencies optional