Support for replicate resource and fixes