Extending UNVEIL