Change dependencies to primitive objects