added better property setting