Increased server functionality
Fixed JSON naming convention discrepancy