Improve startup and payload handling