Added class with demo