Fixed scoping issue in base application