Refactor of the mock applications