Change base entry Collection class to use entities instead of entries