Added remaining properties (more still may be needed).