Move common components to strapped