Code refactoring, Added host app