Refactor ids: use uuid