Architectural changes and functionality improvements