Incorporated feedback, Added support for File type