Core skeleton updates