[TASK] Simplify Atom Entry Source handling