Improvements and compatibility with new web app