Changing dependencies to use system scope