More changes, security modeling