Server patched to make it work with new structure