Moved out dependencies