improve stage creation close #79