Add OfflinePlayer support where needed