added rabbit support