Added classes: Component, Id