Updated classmap & global config