Added master/details support for group/targets