Fixed issues in beta 5
Provide singleton instance
Add a current level