Major refactoring, add better scalability