NXP-14977: Add classes on old form