#17 - Better support for named instances