Moved vanilla schematics in a non-API class
(this will allows fixes on minor versions).
Implemented portal support, for #1508.