Updating classes for 0.5.0