Added first data step handling at backend