Edited Server class