Improving launch API