Moved to bonzo for classname handling