Add parent scope
Add composer support