Improved annotation for disasters_model