More refactoring + Proper links management