Small updates to existing classes