Starling framework improvements

Starling framework improvement