Merge classes & minor changes