TUP-2202 : libraries improvements