Fixed Raven SR, using Singleton pattern instead of static
Actuallty implemented as singleton