Added properties parsing