Better support for  sw600dp & sw130dp devices