Added replicate support