refractoring on Engine-Core