Promise implementation, workflow changes