added many more components and addons