Added demo class here and there