Implemented singleton in more places