Minor refactor on Apps' interfaces