More on Entry API.
Minor refactor and documentation.