Updated blueprint to version 2