Switch to standard/overridable library