Make APP1 parser injectable
Rework APP1 marker location