Added classes. Preserving stable build. :)