Added support for sectors