Added support for non-occupying SO