Added agent/delegate attributes