More functionality with class driven