Refactor blueprint

See discussion below.