Added assignments setup