More refactoring
Fix bug with reload
Fix deletion