Add support for multiple items