better handling of deps