Added properties.
Fixed type error.