Added classes, removed unused functions