Added support for closed state