New entry points, incl. redundancy check