Version 0.3.5: Added support for various classes