Conversion to support4 library