Move remaining properties for consistency