Added metadata to NameStateBuilder
More playing with state loading