Refactoring for the future colloabration