Added length markers for parsing