Parser updated to accomodate block type.