restructuring and adding missing ows props