Extending infrastructure