[#18] Edge related things refactoring