Added tree support in content entity