Refactoring done for Gitlab and Hall