More blueprint improvements