I added some properties. Please merge if it is good.