Adding support for existing handle;
Updating demo;