Add switch v0.2: need to deal with pkg