Update code in order to work with latest Start version