Added ServerAdapter