Updated entry points