Better block parsing