Replica Set support added