Simplified server logic, better async methods added