Refactoring & fix lacking component