This could be moved in the system app object