Adding support for Evolve.
Do not use this yet, need some testing.