Moved from using Promise to Q