Core: Complete new GeSiCa handling, but untested