Converted to a more scalable architecture