Reshaping for 0.5.0 version with new semantics