Update support lib to r18