Feature/los refactoring