Add spk files, and update compose.py for mail implementation changes.