[BUG FIX] Core generator's templates updated