That is probably a good idea. When write the code, I was try to avoid making mazha to depend on the higher level class "Replication". Give they are all in one library, it might be less concerned now.