Blueprint refactor