Add extra support and remove play services