Add more CaPSIDy stuff