Added several more components