Removed unused data types and added JSON instances