Adding more explicit dependencies