Improvements on server