Update app to last PSA codebase. Refs #1