Added & tested dependency support