Added class and demo