Added join and init hooks