Server: Adapted for SP client