Updated regexp for parse data