Refactored the API Server calls to be a little simpler in terms of Types and sub types. Fixed Demo API to include all permissions.