Making progress on handling dependencies