Added support for FileView.
changes for accommodating into rest-client