Added classes support, everythings magical again.