Add -property switch to ensure explicity (is that a word?)