Added classes to operate on song