Adding dependencies support and tests