Added more Components data