Add Components implementation
Fix typo