Changes for compatibility with server