:+1: #1189, #1194: Add clazz option