Add identity, code adjustments