All features from workshop added