- Renamed trait Singleton due to code conventions