Convert to class, more parameters cleanup
Sort changelog correctly, update for latest commits