Server-side: Fix for missing function-case

Client-side: Added some missing functionality