Added checks for arranger data on server