Minor fixed in Application, moved functionality from SAPI to Application