Add @users, @tasks tags, move repeated steps to before hooks