Updated version of the support lib.