added conditional dependencies