Fixed CI Type model information appearing in JSON output
Added methods to get current user and tenant