Changed key name to server_* and added to meta data key