Updated support library to version 18