Adding more attributes
More work on getting replication working