Add by-name support