Added classes to allow Hvad integration