Added scalability and removed redundancies