Json custom model controller, token decorator improvements