Adding site_id considerations as well as changing permission naming convention