Preparing for integration with Topia