added component/pillbox support