Updated support lib