Added more content and fixes for replication