Adding goroutine support