Moved entityID to ConfigHandler