added a few more components