Added classes to helpers