React to identity changes

enum is gone and replaced with properties