Implemented easier scalability