Working prototype for the future changetype handlig. Mostly backward compatible