Allow fetching additional attributes.

Part of the patch 7313 from http://adui.codeplex.com/SourceControl/list/patches