Format code
Add properties for replicator