Fix case
Add missing functions