Better dependency code