added PropertyParser