add support for named instances and name prefix