Add more variants to the barrier

Change-Id: I3247fc0c6ad5a9cf5d1aa64ea998ddeaaa3963be