Move some other functionality to extras.