Updated coreclass and functions to cope with new language settings