Various changes to handle singleton pattern