Re-added refs for support library