Added collection hydration support to entities