Add time out and JOIN_GRANT