Updating support lib to to solve compilation issues