+++ Added support for "unsafe" classes