Added a lot of missing entries