Added Spica support