Updated classes to be even lighter