Modified property handlng for variants