More dialect rework, don't want to support oracle