Add additional self checks
Add agent join and force leave