Adding SIO support