Fixed issues, removed `Component` class.