Upgraded service stack references