Updates to Usage and Entry Point added