improved waterline promise chaining