#297 Move status handler