Added a lot of missing entries (untill line 625)