Adding pojo structure required for child level policies and related changes