Adding ioc singleton support.