Made few changes in AbstractDemo