Adapted to new dynamic client
Added forgotten file
Merged