Better compatibility, added option to include system apps