Added some helpers for evolution
Next improvements