Move awareness of identity into source definition