Updating core classes