Rework app proxy module