Adding class names and more methods