Convert ids to classes
Updated to 0.5.9