Added base application support