Refactoring of entry point API
Updated Scene to use the entry point detection api