Changed dependencies and stuff