Added dependencies handling