Better promise resolutions for models