* Small refactoring
* Component info from v1.1 imported