Partial changes for enabling demo