Edit view and introduce source mapping