Add support for entry points