Reorganize encodings and add details