Improved App Mock