Some exceptions added. Singleton support