Add support for .dw and .pad