Added component items + refactor