Implemented Dispose on the server
Performance tuning