Updated core framework to singleton design pattern