Refactored default application to use this-ns