Reworked scope entry.