A few small updates to match the framework v1