#3 - Added and enabled entity and entityreference.