Merge
Added core code for automatical introspectability