Added serve mode