Adding clustering component and other dependencies