Added support for appdata