Feature/created at

Shouldn't this `break;` when the component is found?