Improve app resources collection