Changed map to store entities rather than just characters.