Add supprot for contrib package