Use new way of handling default entities