Adding demo instances
Fixing usage reporting