Structure modifications to API and Server