Make Properties support context #55