20140325: Massives refactoring