Adding Promise for Issue #327