Fix entrypoint to accept cmdargs