Updated to support standard DX types by default