Updated more dependency definitions