Refactor and Re-imple mock app output