Added configurable class names