Towards Uniform Implementation of Architectural Diversity