Improvements hot reload