Add capability as soon as you need it

Add capability as soon as you need it