Updated classes for 0.4.1 release