Add REPLACE support