Updated metabox framework