Adaptations for SPA operation