Added support for pieces