Fresh commit after finalizing the entry format and fixing the existing entries accordingly.