added props parsing