Promise chain + Other changes