Added SPA support to serve