RA-363 - Refactor app context model to be closer to our ideal representation