Set acknowlege mode from auto to client-acknowledge
Clean code