Updates to supervisor and application