Removed type guessing from client, going to do it locally