Added 'depends' support