FNM app related files and changes