Improvements to stub app