core: structure changed to version 2