More separation of character and entity