Add pikapi and shiggy