Add library-based overrides support