Added base block + barrier classes