Modifying Replicator to match API spec