Working on making components runtime-aware