Added classes and changes to handlers