More work on steps creation/updating