Blueprint builder now respect claims