Switching over to use Entity to abstract both Application and Person principals