Added implemention for server