Code adjustments for support library