Updated for improved per property permissions