Refactored server database data structures