Working on server security extended