extended to provide basic coverage for all entry types