Change over to a Blueprint factory method