Added support for empty parts