Better dependency system