Refactor promising system