Moving the class out of the language fields and making it accessible via a primitive only

Updated to the latest core-lib

Signed-off-by: Stefan Marr <git@stefan-marr.de>