Made further modifications to fix other outstanding issues
Made some modifications related to integration with apps