moved Identity to separate file