Add support for dynamic offset. Fix live option.