Added KVC support