Added support for partial and complete list