[blueprint annotation] update factory method and argument annotation based on some feedback from Valentin