Added structure for client