Added singleton and updates to class intent