Re-enabling topology extension. Define and use constants.