Add dependencies, update for module name change